From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 17 Oct 2013 01:36:09 +0000 (-0400)
Subject: messageTray: Only try to focus the summary when summoning the tray by <Super>M
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~3191
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f72f39bc26ab8e4883cfb7fc83dd68c8839d6d44;p=gnome-shell.git

messageTray: Only try to focus the summary when summoning the tray by <Super>M

Otherwise, when closing the tray, we'll try to focus an actor, which will
focus the stage window, which will drop the focus from whatever window we
already had focused.

https://bugzilla.gnome.org/show_bug.cgi?id=710347
---

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index c66c9f6fa..f8e029ca3 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2212,7 +2212,10 @@ const MessageTray = new Lang.Class({
     },
 
     toggleAndNavigate: function() {
-        if (this.toggle())
+        if (!this.toggle())
+            return;
+
+        if (this._traySummoned)
             this._summary.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
     },